Merge "mediawiki.special.upload.js: Remove spinner in .always() instead of .done()"

diff --combined resources/src/mediawiki.special/mediawiki.special.upload.js
index 49af809,945bfb0..9836403
--- 1/resources/src/mediawiki.special/mediawiki.special.upload.js
--- 2/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@@ -57,37 -57,32 +57,38 @@@
                },
  
                timeout: function () {
 -                      var $spinnerDestCheck;
 +                      var $spinnerDestCheck, title;
                        if ( !ajaxUploadDestCheck || this.nameToCheck === '' ) {
                                return;
                        }
                        $spinnerDestCheck = $.createSpinner().insertAfter( '#wpDestFile' );
 +                      title = mw.Title.newFromText( this.nameToCheck, mw.config.get( 'wgNamespaceIds' ).file );
  
                        ( new mw.Api() ).get( {
 +                              formatversion: 2,
                                action: 'query',
 -                              titles: ( new mw.Title( this.nameToCheck, mw.config.get( 'wgNamespaceIds' ).file ) ).getPrefixedText(),
 +                              // If title is empty, user input is invalid, the API call will produce details about why
 +                              titles: title ? title.getPrefixedText() : this.nameToCheck,
                                prop: 'imageinfo',
 -                              iiprop: 'uploadwarning',
 -                              indexpageids: true
 +                              iiprop: 'uploadwarning'
                        } ).done( function ( result ) {
 -                              var resultOut = '';
 -                              if ( result.query ) {
 -                                      resultOut = result.query.pages[ result.query.pageids[ 0 ] ].imageinfo[ 0 ];
 +                              var
 +                                      resultOut = '',
 +                                      page = result.query.pages[ 0 ];
 +                              if ( page.imageinfo ) {
 +                                      resultOut = page.imageinfo[ 0 ].html;
 +                              } else if ( page.invalidreason ) {
 +                                      resultOut = mw.html.escape( page.invalidreason );
                                }
-                               $spinnerDestCheck.remove();
                                uploadWarning.processResult( resultOut, uploadWarning.nameToCheck );
+                       } ).always( function () {
+                               $spinnerDestCheck.remove();
                        } );
                },
  
                processResult: function ( result, fileName ) {
 -                      this.setWarning( result.html );
 -                      this.responseCache[ fileName ] = result.html;
 +                      this.setWarning( result );
 +                      this.responseCache[ fileName ] = result;
                },
  
                setWarning: function ( warning ) {
@@@ -123,20 -118,20 +124,21 @@@
                        $spinnerLicense = $.createSpinner().insertAfter( '#wpLicense' );
  
                        ( new mw.Api() ).get( {
 +                              formatversion: 2,
                                action: 'parse',
                                text: '{{' + license + '}}',
                                title: $( '#wpDestFile' ).val() || 'File:Sample.jpg',
                                prop: 'text',
                                pst: true
                        } ).done( function ( result ) {
-                               $spinnerLicense.remove();
                                uploadLicense.processResult( result, license );
+                       } ).always( function () {
+                               $spinnerLicense.remove();
                        } );
                },
  
                processResult: function ( result, license ) {
 -                      this.responseCache[ license ] = result.parse.text[ '*' ];
 +                      this.responseCache[ license ] = result.parse.text;
                        this.showPreview( this.responseCache[ license ] );
                },
  
@@@ -408,10 -403,6 +410,10 @@@
  
                                        $( '#mw-upload-thumbnail .fileinfo' ).text( info );
                                };
 +                              img.onerror = function () {
 +                                      // Can happen for example for invalid SVG files
 +                                      clearPreview();
 +                              };
                                img.src = dataURL;
                        }, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) {
                                try {